Merge.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 13 Oct 2005 14:26:44 +0000 (15:26 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 13 Oct 2005 14:26:44 +0000 (15:26 +0100)

Trivial merge